From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 2 Jan 2010 10:22:05 +0000 (-0500)
Subject: Merge from upstream.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~5232^2~37
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a179af9bd20b2e9968506003937a152c1cbb5d9e;p=emacs.git

Merge from upstream.
---

a179af9bd20b2e9968506003937a152c1cbb5d9e